bitkeeper revision 1.1159.1.263 (41794718665LsSG3Fbsy6vsHfoGMOA)

Use updated evtchn interface to allow console reconnect after xend restart.

diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c
index 4af52375fd5e260569feabee956f8fb90a37fd34..d08a17aa111db09068adfed8cded1aed0fddc5ad 100644 (file)
--- a/tools/python/xen/lowlevel/xu/xu.c
+++ b/tools/python/xen/lowlevel/xu/xu.c
@@ -1061,7 +1061,7 @@ static PyObject *xu_port_new(PyObject *self, PyObject *args)
     u32 dom;
     int port1 = 0, port2 = 0;
 
-    if ( !PyArg_ParseTuple(args, "i", &dom) )
+    if ( !PyArg_ParseTuple(args, "i|ii", &dom, &port1, &port2) )
         return NULL;
 
     xup = PyObject_New(xu_port_object, &xu_port_type);

diff --git a/tools/python/xen/xend/server/channel.py b/tools/python/xen/xend/server/channel.py
index 57861b626a9c1bda8b24587b56e25d17e69db23f..1401c35435cec10ac376bc5cfa59b9b17f119763 100755 (executable)
--- a/tools/python/xen/xend/server/channel.py
+++ b/tools/python/xen/xend/server/channel.py
@@ -94,7 +94,7 @@ class ChannelFactory:
     def createPort(self, dom, remote_port=0):
         """Create a port for a channel to the given domain.
         """
-        return xu.port(dom, remote_port)
+        return xu.port(dom, 0, remote_port)
 
 def channelFactory():
     """Singleton constructor for the channel factory.